libxl: Fix apic/acpi confusion

"apic" was written a couple of times where "acpi" was meant.

Signed-off-by: Zhou Peng <zhoupeng@nfs.iscas.ac.cn>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <Ian.Campbell@eu.citrix.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/tools/libxl/libxl.idl b/tools/libxl/libxl.idl
index a5be66ff42774e4179904ba744f73d48c69c2a20..f0fb22f5bead5e7f8b8e6f468269230a04f5f447 100644 (file)
--- a/tools/libxl/libxl.idl
+++ b/tools/libxl/libxl.idl
@@ -217,7 +217,7 @@ libxl_device_model_info = Struct("device_model_info",[
     ("usb",              bool,              False, "usb support enabled or disabled"),
     ("usbdevice",        string,            False, "enable usb mouse: tablet for absolute mouse, mouse for PS/2 protocol relative mouse"),
     ("soundhw",          string,            False, "enable sound hardware"),
-    ("apic",             bool,              False, "apic enabled or disabled"),
+    ("acpi",             bool,              False, "acpi enabled or disabled"),
     ("vcpus",            integer,           False, "max number of vcpus"),
     ("vcpu_avail",       integer,           False, "vcpus actually available"),
     ("xen_platform_pci", bool,              False, "enable/disable the xen platform pci device"),

diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 2cd5910cce1cb5d82aba39149c1f6b9e5bade767..0fc6d04d95825b10236113beda4c5920bc8ec4b3 100644 (file)
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -113,7 +113,7 @@ void libxl_init_dm_info(libxl_device_model_info *dm_info,
     dm_info->device_model = NULL;
     dm_info->target_ram = libxl__sizekb_to_mb(b_info->target_memkb);
     dm_info->videoram = libxl__sizekb_to_mb(b_info->video_memkb);
-    dm_info->apic = b_info->u.hvm.apic;
+    dm_info->acpi = b_info->u.hvm.acpi;
     dm_info->vcpus = b_info->max_vcpus;
     dm_info->vcpu_avail = b_info->cur_vcpus;
 

diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index 76479fe96e20b2783e446aeda129ce9e710f1f49..f90c1f372ae2000fb6b19e5279a63f9b4089bbbd 100644 (file)
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -162,7 +162,7 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc,
         if (info->soundhw) {
             flexarray_vappend(dm_args, "-soundhw", info->soundhw, NULL);
         }
-        if (info->apic) {
+        if (info->acpi) {
             flexarray_append(dm_args, "-acpi");
         }
         if (info->vcpus > 1) {
@@ -315,7 +315,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc,
         if (info->soundhw) {
             flexarray_vappend(dm_args, "-soundhw", info->soundhw, NULL);
         }
-        if (!info->apic) {
+        if (!info->acpi) {
             flexarray_append(dm_args, "-no-acpi");
         }
         if (info->vcpus > 1) {

diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 28e810cd2c43cb19959d99faa571851821c22a28..7d02a23b921285e1af87eada08b4bdf2b8fe2069 100644 (file)
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -366,7 +366,7 @@ static void printf_info(int domid,
         printf("\t\t\t(boot %s)\n", dm_info->boot);
         printf("\t\t\t(usb %d)\n", dm_info->usb);
         printf("\t\t\t(usbdevice %s)\n", dm_info->usbdevice);
-        printf("\t\t\t(apic %d)\n", dm_info->apic);
+        printf("\t\t\t(acpi %d)\n", dm_info->acpi);
         printf("\t\t)\n");
     } else {
         printf("\t\t(linux %d)\n", b_info->hvm);